merge trunk
authorK. Handa <handa@gnu.org>
Thu, 18 Jul 2013 12:49:00 +0000 (21:49 +0900)
committerK. Handa <handa@gnu.org>
Thu, 18 Jul 2013 12:49:00 +0000 (21:49 +0900)
commitce0e0c0c1dabbe473745af3506d6418da0a214a9
treea3e6d456c47dc7b3328ea420115bc5c40cc4e7f4
parentd69e009b98209918a6de7ae207812c59d5d1ebaa
parent907a0c35c0abadad30f00c9f58d5671c369d63bf
merge trunk